Merge "Add atom and logging for app overlay"