Merge "Revert "Framelayout for recyclerview and appbar"" into rvc-dev am: 1a43996840 am: 940cd71d89

Change-Id: Ia3d03550dca2496ebf86aff05dbeb8e2e73b1511