Merge "Revert "Framelayout for recyclerview and appbar"" into rvc-dev