Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev