Lint: Address some UselessParent warnings.

<LinearLayout> inside unpadded <FrameLayout>, which serves no purpose
whatsoever. Removed the former.