Merge "Let psApp change according to theme." into main