Merge "Revert "Revert "Finalizing Q resources""" into qt-dev am: d7219205a0
am: 6c2e976c58

Change-Id: I0d61e5e59c9cfafa4968379251a7c7dc2c038fe7