Merge "Remove FrameLayout around toolbar" into oc-dev