Merge "Removed the darkShelf logic" into qt-dev am: f3bf364998
am: 027fd45421

Change-Id: Ie6b369b4e0abb111bd3566d3b8f2403f60ce4b1d