Bug 1025824 - Fix mHwcLayerMap handling r=sushil