Merge "Fix the status bar test app."