Merge "We should prevent starting home activity before setup" into qt-dev am: d031113290
am: 340f79bc15

Change-Id: I9595d0fe49bbbb6e3e27637bac0e87b4f6fbfc5b