Merge \"Syncronize renderPage vs. onServiceDisconnected\" into nyc-mr1-dev
am: c7c647bbf0

Change-Id: Ibd18df2822dbb0993eb4fc22392c3c523197c540