Merge "Add highlight menu key for app pages" into tm-dev