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

Change-Id: I7ff33df820d2b69e536f6431a2b67688997e26b3