Merge "Code streamlining" into qt-dev am: 50324f99a1
am: 25408cb1f0

Change-Id: I4bdcae86084133c19b47556f4ed1293a5d2f9fb6