Merge "Merge \"Allow quick view package to be set via setprop.\" into nyc-mr1-dev am: 24cea93b4a" into nyc-mr1-dev-plus-aosp