Merge "Splits out ACTION_MAIN intent filter for Settings and doesn't forward it." into lmp-dev