Merge "Check for developer option on resuming settings activity." into sc-dev