Merged changed from Photo Frame fixes