Merge "Fix blank page activity selection bug"