Merge "Fix notification permission for letterboxed activity" into tm-qpr-dev