Merge "Fix for QUICK_LAUNCH_SETTINGS intent"