Merge "Fixing while navication bar in all-apps in 3-button mode." into tm-qpr-dev