Merge "board-msm7x27a: display: set display brightness level during resume" into gingerbread_chocolate