Merge "Add 1x1 transparent dummy img so we can reference bg_cling5" into jb-dev