Merge "Update launch intent flags for settings shortcut widgets." into pi-dev