am 36bde9a9: Merge "Add fake CustomContent screen for testing Launcher interface" into ub-launcher3-burnaby

* commit '36bde9a9e50412329237081e595d732b7da93e0b':
  Add fake CustomContent screen for testing Launcher interface