Merge "Update to used EXTRA_TOTAL_SIZE..." into arc-apps