Merge "Do not hide nav bar on the homescreen from setup" into main