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