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

Change-Id: Id7830f8db993583556a1ec2deb78573672819b4d