Merge "Provide synchronization to setview to avoid NPE" am: b05b93a674
am: 810c31fdca

Change-Id: Ibd664e4836eaceef8a4d8363793667afa757387a