Merge changes from topic "no_layers_profileable" into qt-dev am: 3893e5d9ea am: 4368822d7d
am: b53307c88a

Change-Id: Ie6fbdcd1950be28bcf8e4daeee6e182a8c1b830f