Merge fee17133d0708d5ee6bb50985530da6783d5f217 on remote branch

Change-Id: I4c8cd029a6da272e68f26c018afd36a1fcd0a639
Merge "Merge fee17133d0708d5ee6bb50985530da6783d5f217 on remote branch"
add missing ic_switch_video_holo_dark

Change-Id: I31c50e06697afff80e9c200a156ff3bf9766f5d0