Merge "Merge "We should prevent starting home activity before setup" into qt-dev am: d031113290 am: 64b89ace25" into qt-r1-dev-plus-aosp