Merge "Revert "Settings: Enable up navigation for Status and legal info"" into cm-10.2