Merge "rewrite HC Gallery app to support phones. In summary, this change:"