Merge "Fix for 2284833 : Remove big brightness icon and make it a small one on the title bar."