Merge "Set current frame during status bar layout"