Bug 1007569: Fixed screen hang issue. Fixed UI to match UX spec.
Merge pull request #19142 from kamituel/Bug_1007569

Bug 1007569: Fixed screen hang issue. Fixed UI to match UX spec.