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

Change-Id: I366e6152ba80f86d783dda9aa8181bd154c104ea