Merge changes I60315690,Ie4e8399c into msm-3.0

* changes:
  msm_fb: display: fix no resume after suspend for cmd mode panels
  msm_fb: display: clear mixer blending cache during resume