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

Change-Id: I6b95a25e1b038d8b3ffcbce1019688be3a3980db