Merge "Revert "Revert "Load app images"""
am: 1af0204ddd

* commit '1af0204dddc1d99dc17a13eca135c1b57023c1c3':
  Revert "Revert "Load app images""