Merge "We don't need to wait to pin the camera app." into nyc-mr1-dev
am: b0da868b63

Change-Id: I6a308fa40e3affd0db9446b4253a89f39da11118