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

Change-Id: I115bb6497ce0b8613cc4b13c267663ed4c9edada