Merge "Apply theme by using notification context"