Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs