Removing left over experimental overlays and frame width (2/2)
am: 6b435c2a6a

Change-Id: I89813ff37ad8cd23472bde5df3525b1070b7eb85