Merge "[RenderEngine] relax locking conditions of image cache." into qt-r1-dev am: 5119d1adf3
am: 4b58b3bea4

Change-Id: I2897351922f0bf30c3d42303413918087789334a