Merge "Remove overscroll from app styled view" into car-apps-dev