Merge "Align AppBar top margin with current Settings"