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

Change-Id: I69101baf2d16cf07a4218d8b3316091e04511eb6