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

Change-Id: Ib5b7470db042d60593d2e545c901240a456dcada