Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb