Merge "Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"" into qt-qpr1-dev