Merge "Add null check for status bar transitions" into rvc-dev