Merge "Fix issue where navbar wouldn't be on lock screen" into qt-dev