Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev